From 838e3d47bac3f3ac9080e7866b5f6e37a31f9f9b Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 22 Mar 2017 08:31:14 +0000 Subject: [PATCH] force-use-luajit-system-lib Gbp-Pq: Name 0004-force-use-luajit-system-lib.patch --- lib/Makefile.am | 23 ----------------------- lib/Makefile.in | 29 +++-------------------------- lib/atscppapi/Makefile.in | 6 +++--- lib/atscppapi/examples/Makefile.in | 6 +++--- lib/atscppapi/src/Makefile.in | 6 +++--- lib/bindings/Makefile.am | 5 +++-- lib/bindings/Makefile.in | 11 ++++++----- lib/perl/Makefile.in | 6 +++--- lib/records/Makefile.in | 6 +++--- lib/ts/Makefile.in | 6 +++--- lib/tsconfig/Makefile.in | 6 +++--- lib/wccp/Makefile.in | 6 +++--- 12 files changed, 36 insertions(+), 80 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index c0a63899..7fb4e3cc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -25,26 +25,3 @@ endif if BUILD_WCCP SUBDIRS += wccp endif - -# Some special hacks around building the luajit. -# -# - Copy the luajit source tree if we're doing out-of-source builds -# - Upon clean, remove the luajit tree from the out-of-source build tree -# -# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs -# the -m64 flag. See configure.ac. -# -all-local: - @echo "Making all in luajit" - test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/" - cd luajit && $(MAKE) $(AM_MAKEFLAGS) \ - BUILDMODE="static" \ - PREFIX="$(prefix)" \ - CC="$(CC)" \ - CFLAGS="$(LUAJIT_CFLAGS)" \ - XCFLAGS="" \ - LDFLAGS="$(LUAJIT_LDFLAGS)" - -clean-local: - test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean) - test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit" diff --git a/lib/Makefile.in b/lib/Makefile.in index 406f08a9..3578f595 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -305,9 +305,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -906,29 +906,6 @@ uninstall-am: .PRECIOUS: Makefile -# Some special hacks around building the luajit. -# -# - Copy the luajit source tree if we're doing out-of-source builds -# - Upon clean, remove the luajit tree from the out-of-source build tree -# -# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs -# the -m64 flag. See configure.ac. -# -all-local: - @echo "Making all in luajit" - test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/" - cd luajit && $(MAKE) $(AM_MAKEFLAGS) \ - BUILDMODE="static" \ - PREFIX="$(prefix)" \ - CC="$(CC)" \ - CFLAGS="$(LUAJIT_CFLAGS)" \ - XCFLAGS="" \ - LDFLAGS="$(LUAJIT_LDFLAGS)" - -clean-local: - test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean) - test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit" - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/atscppapi/Makefile.in b/lib/atscppapi/Makefile.in index 928d797e..d99c7bbd 100644 --- a/lib/atscppapi/Makefile.in +++ b/lib/atscppapi/Makefile.in @@ -284,9 +284,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/atscppapi/examples/Makefile.in b/lib/atscppapi/examples/Makefile.in index 52e00f2a..21ef0dab 100644 --- a/lib/atscppapi/examples/Makefile.in +++ b/lib/atscppapi/examples/Makefile.in @@ -529,9 +529,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/atscppapi/src/Makefile.in b/lib/atscppapi/src/Makefile.in index b201b167..066d2c4b 100644 --- a/lib/atscppapi/src/Makefile.in +++ b/lib/atscppapi/src/Makefile.in @@ -350,9 +350,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am index 3918c3d0..a88db7b1 100644 --- a/lib/bindings/Makefile.am +++ b/lib/bindings/Makefile.am @@ -19,9 +19,10 @@ include $(top_srcdir)/build/tidy.mk AM_CPPFLAGS = \ - $(LUAJIT_CPPFLAGS) \ + $(LUA_CPPFLAGS) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records + -I$(top_srcdir)/lib/records \ + $(LUA_CPPFLAGS) noinst_LTLIBRARIES = libbindings.la diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in index 290a0cda..0ef9783e 100644 --- a/lib/bindings/Makefile.in +++ b/lib/bindings/Makefile.in @@ -326,9 +326,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -608,9 +608,10 @@ Clang_Tidy_CXX_Files = $(filter %.cc, $(sort $(1))) CXX_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CXX_Files,$^) -- $(CXXCOMPILE) -x c++ CC_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CC_Files,$^) -- $(COMPILE) -x c AM_CPPFLAGS = \ - $(LUAJIT_CPPFLAGS) \ + $(LUA_CPPFLAGS) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records + -I$(top_srcdir)/lib/records \ + $(LUA_CPPFLAGS) noinst_LTLIBRARIES = libbindings.la libbindings_la_SOURCES = \ diff --git a/lib/perl/Makefile.in b/lib/perl/Makefile.in index 0fdb21a4..e7a370d2 100644 --- a/lib/perl/Makefile.in +++ b/lib/perl/Makefile.in @@ -242,9 +242,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/records/Makefile.in b/lib/records/Makefile.in index e8b52821..7a10f42e 100644 --- a/lib/records/Makefile.in +++ b/lib/records/Makefile.in @@ -347,9 +347,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/ts/Makefile.in b/lib/ts/Makefile.in index 7656215c..531e4092 100644 --- a/lib/ts/Makefile.in +++ b/lib/ts/Makefile.in @@ -634,9 +634,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/tsconfig/Makefile.in b/lib/tsconfig/Makefile.in index 2ee46737..ec759bae 100644 --- a/lib/tsconfig/Makefile.in +++ b/lib/tsconfig/Makefile.in @@ -399,9 +399,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/wccp/Makefile.in b/lib/wccp/Makefile.in index 15828834..a12616c9 100644 --- a/lib/wccp/Makefile.in +++ b/lib/wccp/Makefile.in @@ -334,9 +334,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -- 2.30.2